From: Timm Bäder <mail@baedert.org>
Date: Tue, 21 May 2019 09:07:23 +0000 (+0200)
Subject: gtkicontheme: Avoid a get_icon_flags call
X-Git-Tag: archive/raspbian/4.4.1+ds1-2+rpi1~1^2~321^2^2~914
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=6d77723fe04760f49f34962a9715259721b48ed3;p=gtk4.git

gtkicontheme: Avoid a get_icon_flags call

We're only using the value of the first call at all if
symbolic_suffix & ICON_SUFFIX_PNG is FALSE.
---

diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c
index 1cb73635e0..7aac0b8b3e 100644
--- a/gtk/gtkicontheme.c
+++ b/gtk/gtkicontheme.c
@@ -2798,10 +2798,6 @@ theme_dir_get_icon_suffix (IconThemeDir *dir,
 
   if (dir->cache)
     {
-      suffix = (IconSuffix)gtk_icon_cache_get_icon_flags (dir->cache,
-                                                           icon_name,
-                                                           dir->subdir_index);
-
       if (icon_name_is_symbolic (icon_name))
         {
           /* Look for foo-symbolic.symbolic.png, as the cache only stores the ".png" suffix */
@@ -2813,7 +2809,15 @@ theme_dir_get_icon_suffix (IconThemeDir *dir,
 
           if (symbolic_suffix & ICON_SUFFIX_PNG)
             suffix = ICON_SUFFIX_SYMBOLIC_PNG;
+          else
+            suffix = (IconSuffix)gtk_icon_cache_get_icon_flags (dir->cache,
+                                                                icon_name,
+                                                                dir->subdir_index);
         }
+      else
+        suffix = (IconSuffix)gtk_icon_cache_get_icon_flags (dir->cache,
+                                                            icon_name,
+                                                            dir->subdir_index);
 
       if (has_icon_file)
         *has_icon_file = suffix & HAS_ICON_FILE;